Usenet 1993 July

home *** CD-ROM | disk | FTP | other *** search

/ Usenet 1993 July / InfoMagic USENET CD-ROM July 1993.ISO / sources / x / volume6 / xfig2 / patch6.1 < prev next >

Wrap

Internet Message Format | 1993-04-28 | 63.3 KB

From: envbvs@epb2.lbl.gov (Brian V. Smith) Newsgroups: comp.sources.x Subject: v06i081: xfig 2.0, Patch6, Part01/06 Message-ID: <134787@sun.Eng.Sun.COM> Date: 24 Apr 90 22:25:50 GMT Approved: argv@sun.com Submitted-by: envbvs@epb2.lbl.gov (Brian V. Smith) Posting-number: Volume 6, Issue 81 Archive-name: xfig2/patch6.1 Patch-To: xfig2: Volume 6, Issues: 9-24, 34-36, 50-56 Xfig Version 2.0 Patchlevel 6 (3/24/90) Changes from patchlevel 5: o *** New popup menu to change characteristics of existing objects, e.g. line thickness, style, text options, area fill etc. Not ALL things may be modified yet (e.g. arrows on lines). Jon Tombs and Frank Schmuck provided this much-needed feature o Because the popup menu uses the new Simple Menu widget from R4, xfig will no longer compile under R3 o Fixed WMHints to "or" in InputHint to retain any existing Hints Thanks to David Elliott o Doesn't let one delete to fewer than 3 points in interpolated spline o Removed unused variables o Changed rounded-corner box objects to have radius component instead of using the pen component (new protocol version 2.0 and 2.0-TFX) o Added back support to read protocol version 1.3 files o Fixed bug where the line style wasn't passed in drawing bounding rectangle when moving/copying objects o Fixed cursor for popup command menu o Fixed bounding box bug for postscript output from f2ps o Fixed bug that erroneously allowed filled polylines (only polygons, boxes, round-corner boxes, ellipses, circles, closed splines and arcs may be filled) o Fixed name of AvantGarde-Book font (was AvantGarde) o Added two X fonts that are similar to AvantGarde... and Palatino... From Dave Davey o Fixed bug that caused coredump when referencing a zero-radius ellipse o Added back the LaTex buttons even for non-TFX mode o More SYSV #ifdefs from Scott E. Garfinkle (dacseg@uts.amdahl.com) o New rule in Imakefile to install troff_ft_codes file o put_fmsg() uses double arguments instead of float to prevent some systems from choking on float-double-float conversions of invalid data. o 8-bit characters allowed for text objects From Tor Lillqvist <tml@hemuli.tik.vtt.fi> NOTE: The files changetext.c, changethick.c and changestyle.c are no longer used by xfig. They have been superseded by change.c. As always, direct any questions, bugs, fixes :-) to me at: Brian V. Smith envbvs@epb2.lbl.gov or bsvmith@lbl.gov ------------------------ Part 1 of 6 follows ------------------------- #! /bin/sh # This is a shell archive. Remove anything before this line, then unpack # it by saving it into a file and typing "sh file". To overwrite existing # files, type "sh file -c". You can also feed this as standard input via # unshar, or by typing "sh <file", e.g.. If this archive is complete, you # will see the following message at the end: # "End of archive 1 (of 6)." # Contents: README.diff arc.c.diff arcbox.c.diff autoarrow.c.diff # bound.c.diff box.c.diff canvas.c.diff deletept.c.diff dir.c.diff # drag.c.diff f2p.c.diff fig.h.diff file.c.diff flip.c.diff # font.c.diff func.h.diff graphics.c.diff grid.c.diff # intspline.c.diff object.h.diff paintop.h.diff panel.h.diff # panel2.h.diff patchlevel.h.diff print.c.diff psbits3.c.diff # redisplay.c.diff resources.h.diff rotate.c.diff save.c.diff # search.c.diff spline.c.diff troff_ft_codes.diff turn.c.diff # undo.c.diff version.h.diff xtra.h.diff # Wrapped by envbvs@epb2.lbl.gov on Tue Apr 24 11:56:42 1990 PATH=/bin:/usr/bin:/usr/ucb ; export PATH if test -f 'README.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'README.diff'\" else echo shar: Extracting \"'README.diff'\" $2711 characters$ sed "s/^X//" >'README.diff' <<'END_OF_FILE' X*** README.old Tue Apr 24 11:48:04 1990 X--- README Tue Apr 24 11:30:43 1990 X*************** X*** 3,12 **** X NOTE: Version 2.0 of xfig no longer supports SunView! If you wish to X retain compatibility with SunView, use version 1.4.3. X X Added Features: X =============== X X! o Separate version number for program vs file format (protocol now 1.4X) X X o Area fill for circles, boxes, etc. with 20 different gray shades X for Postscript output X--- 3,17 ---- X NOTE: Version 2.0 of xfig no longer supports SunView! If you wish to X retain compatibility with SunView, use version 1.4.3. X X+ Also, xfig must be compiled under X11R4 because of the new X+ simple-menu used in the popup menu to modify objects. X+ X+ Note: See the CHANGES file for up-to-date information X+ X Added Features: X =============== X X! o Separate version number for program vs file format (protocol now 2.0) X X o Area fill for circles, boxes, etc. with 20 different gray shades X for Postscript output X*************** X*** 15,35 **** X can be used in figures at any point size. If there is a corresponding X font in X, then the text is shown in that font on the screen. X X! o text can be virtually any point size X X o left, center and right justification of text X X o rounded-corner boxes with any radius of the corners X- "pen" component of the object is used for the radius (in pixels) X X! o different line thicknesses X X! o lower button panel for quick access to "save", "chdir", etc. functions X X! o button to change the line thickness of an existing object X X- o button to change the line type of an existing object X- X o portrait or landscape print mode X X NOTE: I will support these features as best I can, but I cannot promise X--- 20,37 ---- X can be used in figures at any point size. If there is a corresponding X font in X, then the text is shown in that font on the screen. X X! o text can be virtually any point size (on output) X X o left, center and right justification of text X X o rounded-corner boxes with any radius of the corners X X! o line thicknesses supported X X! o lower button panel for quick access to "save", "undo", etc. functions X X! o popup menu to modify existing objects X X o portrait or landscape print mode X X NOTE: I will support these features as best I can, but I cannot promise X*************** X*** 36,47 **** X anything, as my normal workload is pretty full. X Brian Smith X (bvsmith@lbl.gov) X- X- X- Deleted Features: X- ================= X- X- o f2p (fig to pic) support not updated for above features X X _________________________________________________________________________ X FIG 1.4 Release 2 X--- 38,43 ---- END_OF_FILE if test 2711 -ne `wc -c <'README.diff'`; then echo shar: \"'README.diff'\" unpacked with wrong size! fi # end of 'README.diff' fi if test -f 'arc.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'arc.c.diff'\" else echo shar: Extracting \"'arc.c.diff'\" $1586 characters$ sed "s/^X//" >'arc.c.diff' <<'END_OF_FILE' X*** arc.c.old Tue Apr 24 11:48:05 1990 X--- arc.c Mon Apr 16 11:24:04 1990 X*************** X*** 110,116 **** X X x = point[0].x; y = point[0].y; X for (i = 1; i < num_point; i++) { X! pw_vector(canvas_pixwin, x, y, point[i].x, point[i].y, INV_PAINT, X 1, SOLID_LINE, 0.0); X x = point[i].x; y = point[i].y; X } X--- 110,116 ---- X X x = point[0].x; y = point[0].y; X for (i = 1; i < num_point; i++) { X! pw_vector(canvas_win, x, y, point[i].x, point[i].y, INV_PAINT, X 1, SOLID_LINE, 0.0); X x = point[i].x; y = point[i].y; X } X*************** X*** 133,140 **** X arc->style = line_style; X arc->thickness = line_thickness; X arc->style_val = cur_styleval; X! arc->pen = NULL; X! /* added 3/1/89 B.V.Smith */ X arc->area_fill = fill_mode? cur_areafill : 0; X arc->color = cur_color; X arc->depth = 0; X--- 133,139 ---- X arc->style = line_style; X arc->thickness = line_thickness; X arc->style_val = cur_styleval; X! arc->pen = 0; X arc->area_fill = fill_mode? cur_areafill : 0; X arc->color = cur_color; X arc->depth = 0; X*************** X*** 176,184 **** X F_arc *a; X int op; X { X! extern int foreground_color, background_color; X! X! curve(canvas_pixwin, round(a->point[0].x - a->center.x), X round(a->center.y - a->point[0].y), X round(a->point[2].x - a->center.x), X round(a->center.y - a->point[2].y), X--- 175,181 ---- X F_arc *a; X int op; X { X! curve(canvas_win, round(a->point[0].x - a->center.x), X round(a->center.y - a->point[0].y), X round(a->point[2].x - a->center.x), X round(a->center.y - a->point[2].y), END_OF_FILE if test 1586 -ne `wc -c <'arc.c.diff'`; then echo shar: \"'arc.c.diff'\" unpacked with wrong size! fi # end of 'arc.c.diff' fi if test -f 'arcbox.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'arcbox.c.diff'\" else echo shar: Extracting \"'arcbox.c.diff'\" $959 characters$ sed "s/^X//" >'arcbox.c.diff' <<'END_OF_FILE' X*** arcbox.c.old Tue Apr 24 11:48:06 1990 X--- arcbox.c Wed Apr 11 11:20:43 1990 X*************** X*** 66,72 **** X { X F_line *box; X F_point *point; X- int tmp; X X draw_rectbox(fix_x, fix_y, cur_x, cur_y, INV_PAINT); X X--- 66,71 ---- X*************** X*** 85,94 **** X box->style = line_style; X box->thickness = line_thickness; X box->color = cur_color; X! box->depth = NULL; X! box->pen = cur_radius; /* use the pen slot for the radius */ X box->area_fill = fill_mode? cur_areafill : 0; X box->style_val = cur_styleval; X box->for_arrow = NULL; X box->back_arrow = NULL; X box->points = point; X--- 84,94 ---- X box->style = line_style; X box->thickness = line_thickness; X box->color = cur_color; X! box->depth = 0; X! box->pen = 0; X box->area_fill = fill_mode? cur_areafill : 0; X box->style_val = cur_styleval; X+ box->radius = cur_radius; /* corner radius */ X box->for_arrow = NULL; X box->back_arrow = NULL; X box->points = point; END_OF_FILE if test 959 -ne `wc -c <'arcbox.c.diff'`; then echo shar: \"'arcbox.c.diff'\" unpacked with wrong size! fi # end of 'arcbox.c.diff' fi if test -f 'autoarrow.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'autoarrow.c.diff'\" else echo shar: Extracting \"'autoarrow.c.diff'\" $1596 characters$ sed "s/^X//" >'autoarrow.c.diff' <<'END_OF_FILE' X*** autoarrow.c.old Tue Apr 24 11:48:07 1990 X--- autoarrow.c Mon Apr 16 11:24:18 1990 X*************** X*** 262,268 **** X if (normal_spline(spline)) { X draw_arrow(p->x, p->y, selected_point->x, X selected_point->y, spline->back_arrow, ERASE); X! pw_vector(canvas_pixwin, selected_point->x, selected_point->y, X round((p->x+selected_point->x)/2.0), X round((p->y+selected_point->y)/2.0), PAINT, X spline->thickness, spline->style, spline->style_val); X--- 262,268 ---- X if (normal_spline(spline)) { X draw_arrow(p->x, p->y, selected_point->x, X selected_point->y, spline->back_arrow, ERASE); X! pw_vector(canvas_win, selected_point->x, selected_point->y, X round((p->x+selected_point->x)/2.0), X round((p->y+selected_point->y)/2.0), PAINT, X spline->thickness, spline->style, spline->style_val); X*************** X*** 290,296 **** X draw_arrow(left_point->x, left_point->y, X selected_point->x, selected_point->y, X spline->for_arrow, ERASE); X! pw_vector(canvas_pixwin, selected_point->x, selected_point->y, X round((selected_point->x+left_point->x)/2.0), X round((selected_point->y+left_point->y)/2.0), X PAINT, spline->thickness, spline->style, spline->style_val); X--- 290,296 ---- X draw_arrow(left_point->x, left_point->y, X selected_point->x, selected_point->y, X spline->for_arrow, ERASE); X! pw_vector(canvas_win, selected_point->x, selected_point->y, X round((selected_point->x+left_point->x)/2.0), X round((selected_point->y+left_point->y)/2.0), X PAINT, spline->thickness, spline->style, spline->style_val); END_OF_FILE if test 1596 -ne `wc -c <'autoarrow.c.diff'`; then echo shar: \"'autoarrow.c.diff'\" unpacked with wrong size! fi # end of 'autoarrow.c.diff' fi if test -f 'bound.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'bound.c.diff'\" else echo shar: Extracting \"'bound.c.diff'\" $828 characters$ sed "s/^X//" >'bound.c.diff' <<'END_OF_FILE' X*** bound.c.old Tue Apr 24 11:48:08 1990 X--- bound.c Thu Apr 5 16:29:24 1990 X*************** X*** 338,361 **** X *xmin = sx; *ymin = sy; X *xmax = bx; *ymax = by; X } X- X- control_points_bound(cps, xmin, ymin, xmax, ymax) X- F_control *cps; X- int *xmin, *ymin, *xmax, *ymax; X- { X- F_control *c; X- float bx, by, sx, sy; X- X- bx = sx = cps->lx; X- by = sy = cps->ly; X- sx = min(sx, cps->rx); sy = min(sy, cps->ry); X- bx = max(bx, cps->rx); by = max(by, cps->ry); X- for (c = cps->next; c != NULL; c = c->next) { X- sx = min(sx, c->lx); sy = min(sy, c->ly); X- bx = max(bx, c->lx); by = max(by, c->ly); X- sx = min(sx, c->rx); sy = min(sy, c->ry); X- bx = max(bx, c->rx); by = max(by, c->ry); X- } X- *xmin = round(sx); *ymin = round(sy); X- *xmax = round(bx); *ymax = round(by); X- } X--- 338,340 ---- END_OF_FILE if test 828 -ne `wc -c <'bound.c.diff'`; then echo shar: \"'bound.c.diff'\" unpacked with wrong size! fi # end of 'bound.c.diff' fi if test -f 'box.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'box.c.diff'\" else echo shar: Extracting \"'box.c.diff'\" $1455 characters$ sed "s/^X//" >'box.c.diff' <<'END_OF_FILE' X*** box.c.old Tue Apr 24 11:48:08 1990 X--- box.c Mon Apr 16 11:24:35 1990 X*************** X*** 63,72 **** X draw_rectbox(x1, y1, x2, y2, op) X int x1, y1, x2, y2, op; X { X! pw_vector(canvas_pixwin, x1, y1, x1, y2, op, 1, SOLID_LINE); X! pw_vector(canvas_pixwin, x1, y2, x2, y2, op, 1, SOLID_LINE); X! pw_vector(canvas_pixwin, x2, y2, x2, y1, op, 1, SOLID_LINE); X! pw_vector(canvas_pixwin, x2, y1, x1, y1, op, 1, SOLID_LINE); X } X X elastic_box(x, y) X--- 63,72 ---- X draw_rectbox(x1, y1, x2, y2, op) X int x1, y1, x2, y2, op; X { X! pw_vector(canvas_win, x1, y1, x1, y2, op, 1, SOLID_LINE, 0.0); X! pw_vector(canvas_win, x1, y2, x2, y2, op, 1, SOLID_LINE, 0.0); X! pw_vector(canvas_win, x2, y2, x2, y1, op, 1, SOLID_LINE, 0.0); X! pw_vector(canvas_win, x2, y1, x1, y1, op, 1, SOLID_LINE, 0.0); X } X X elastic_box(x, y) X*************** X*** 102,111 **** X box->thickness = line_thickness; X box->color = cur_color; X box->depth = NULL; X! box->pen = NULL; X! /* added 3/1/89 B.V.Smith */ X box->area_fill = fill_mode? cur_areafill : 0; X box->style_val = cur_styleval; X box->for_arrow = NULL; X box->back_arrow = NULL; X box->points = point; X--- 102,111 ---- X box->thickness = line_thickness; X box->color = cur_color; X box->depth = NULL; X! box->pen = 0; X box->area_fill = fill_mode? cur_areafill : 0; X box->style_val = cur_styleval; X+ box->radius = 0; X box->for_arrow = NULL; X box->back_arrow = NULL; X box->points = point; END_OF_FILE if test 1455 -ne `wc -c <'box.c.diff'`; then echo shar: \"'box.c.diff'\" unpacked with wrong size! fi # end of 'box.c.diff' fi if test -f 'canvas.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'canvas.c.diff'\" else echo shar: Extracting \"'canvas.c.diff'\" $1951 characters$ sed "s/^X//" >'canvas.c.diff' <<'END_OF_FILE' X*** canvas.c.old Tue Apr 24 11:48:09 1990 X--- canvas.c Wed Apr 18 09:34:54 1990 X*************** X*** 19,26 **** X extern int action_on; /* tracker.c */ X extern int magnet_mode; X X- extern int receiving_msg; X- extern int borderwid, stripeht, windowspacing; X extern int CANVAS_WIDTH, CANVAS_HEIGHT; X extern null_proc(); X extern (*canvas_kbd_proc)(); X--- 19,24 ---- X*************** X*** 76,84 **** X Window w; X extern TOOL menu; X X! XTranslateCoordinates(tool_d, canvas_swfd, XDefaultRootWindow(tool_d), X event->xbutton.x, event->xbutton.y, &x, &y, &w); X XtMoveWidget(menu, x-10, y-10); X } X X XtActionsRec canvas_actions[] = X--- 74,83 ---- X Window w; X extern TOOL menu; X X! XTranslateCoordinates(tool_d, canvas_win, XDefaultRootWindow(tool_d), X event->xbutton.x, event->xbutton.y, &x, &y, &w); X XtMoveWidget(menu, x-10, y-10); X+ set_temp_cursor(&arrow_cursor); /* set cursor to arrow for popup menu */ X } X X XtActionsRec canvas_actions[] = X*************** X*** 142,148 **** X setup_canvas() X { X canvas_rightbut_proc = set_popupmenu; X! canvas_pixwin = canvas_swfd = XtWindow(canvas_sw); X init_grid(); X } X X--- 141,147 ---- X setup_canvas() X { X canvas_rightbut_proc = set_popupmenu; X! canvas_win = XtWindow(canvas_sw); X init_grid(); X } X X*************** X*** 155,161 **** X Cardinal *nparams; X { X register int x, y, t; X! char buf[1]; X XButtonPressedEvent *be = (XButtonPressedEvent *)event; X XKeyPressedEvent *ke = (XKeyPressedEvent *)event; X X--- 154,160 ---- X Cardinal *nparams; X { X register int x, y, t; X! unsigned char buf[1]; X XButtonPressedEvent *be = (XButtonPressedEvent *)event; X XKeyPressedEvent *ke = (XKeyPressedEvent *)event; X X*************** X*** 202,206 **** X X clear_canvas() X { X! XClearArea(tool_d, canvas_pixwin, 0, 0, 0, 0, False); X } X--- 201,205 ---- X X clear_canvas() X { X! XClearArea(tool_d, canvas_win, 0, 0, 0, 0, False); X } END_OF_FILE if test 1951 -ne `wc -c <'canvas.c.diff'`; then echo shar: \"'canvas.c.diff'\" unpacked with wrong size! fi # end of 'canvas.c.diff' fi if test -f 'deletept.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'deletept.c.diff'\" else echo shar: Extracting \"'deletept.c.diff'\" $539 characters$ sed "s/^X//" >'deletept.c.diff' <<'END_OF_FILE' X*** deletept.c.old Tue Apr 24 11:48:12 1990 X--- deletept.c Thu Apr 5 17:34:51 1990 X*************** X*** 99,106 **** X return; X } X } X! else if (n <= 2) { /* it must be an interpolated spline */ X! put_msg("An interpolated spline may have less than 3 points"); X return; X } X clean_up(); X--- 99,106 ---- X return; X } X } X! else if (n <= 3) { /* it must be an interpolated spline */ X! put_msg("An interpolated spline cannot have less than 3 points"); X return; X } X clean_up(); END_OF_FILE if test 539 -ne `wc -c <'deletept.c.diff'`; then echo shar: \"'deletept.c.diff'\" unpacked with wrong size! fi # end of 'deletept.c.diff' fi if test -f 'dir.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'dir.c.diff'\" else echo shar: Extracting \"'dir.c.diff'\" $441 characters$ sed "s/^X//" >'dir.c.diff' <<'END_OF_FILE' X*** dir.c.old Tue Apr 24 11:48:12 1990 X--- dir.c Fri Apr 13 09:22:00 1990 X*************** X*** 45,50 **** X--- 45,56 ---- X get_directory(direct) X char *direct; X { X+ #ifdef SYSV X+ extern char *getcwd(); X+ if (getcwd(direct,1024) == NULL) /* get curent working dir */ X+ #else X+ extern char *getwd(); X+ #endif X if (getwd(direct) == NULL) /* get curent working dir */ X { X put_msg("%s", direct); /* err msg is in directory */ END_OF_FILE if test 441 -ne `wc -c <'dir.c.diff'`; then echo shar: \"'dir.c.diff'\" unpacked with wrong size! fi # end of 'dir.c.diff' fi if test -f 'drag.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'drag.c.diff'\" else echo shar: Extracting \"'drag.c.diff'\" $1550 characters$ sed "s/^X//" >'drag.c.diff' <<'END_OF_FILE' X*** drag.c.old Tue Apr 24 11:48:13 1990 X--- drag.c Mon Apr 16 11:24:46 1990 X*************** X*** 143,151 **** X X dx = cur_x - fix_x; X dy = cur_y - fix_y; X! pw_vector(canvas_pixwin, a->point[0].x+dx, a->point[0].y+dy, X a->point[1].x+dx, a->point[1].y+dy, op, 1, SOLID_LINE, 0.0); X! pw_vector(canvas_pixwin, a->point[1].x+dx, a->point[1].y+dy, X a->point[2].x+dx, a->point[2].y+dy, op, 1, SOLID_LINE, 0.0); X } X X--- 143,151 ---- X X dx = cur_x - fix_x; X dy = cur_y - fix_y; X! pw_vector(canvas_win, a->point[0].x+dx, a->point[0].y+dy, X a->point[1].x+dx, a->point[1].y+dy, op, 1, SOLID_LINE, 0.0); X! pw_vector(canvas_win, a->point[1].x+dx, a->point[1].y+dy, X a->point[2].x+dx, a->point[2].y+dy, op, 1, SOLID_LINE, 0.0); X } X X*************** X*** 200,206 **** X y = p->y + dy; X for (p = p->next; p != NULL; x = xx, y = yy, p = p->next) { X xx = p->x + dx; yy = p->y +dy; X! pw_vector(canvas_pixwin, x, y, xx, yy, op, 1, SOLID_LINE, 0.0); X } X } X X--- 200,206 ---- X y = p->y + dy; X for (p = p->next; p != NULL; x = xx, y = yy, p = p->next) { X xx = p->x + dx; yy = p->y +dy; X! pw_vector(canvas_win, x, y, xx, yy, op, 1, SOLID_LINE, 0.0); X } X } X X*************** X*** 262,268 **** X X draw_movingtext() X { X! pw_text(canvas_pixwin, cur_x + x1off, cur_y + y1off, INV_PAINT, X text->font, text->size, text->cstring); X } X X--- 262,268 ---- X X draw_movingtext() X { X! pw_text(canvas_win, cur_x + x1off, cur_y + y1off, INV_PAINT, X text->font, text->size, text->cstring); X } X END_OF_FILE if test 1550 -ne `wc -c <'drag.c.diff'`; then echo shar: \"'drag.c.diff'\" unpacked with wrong size! fi # end of 'drag.c.diff' fi if test -f 'f2p.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'f2p.c.diff'\" else echo shar: Extracting \"'f2p.c.diff'\" $589 characters$ sed "s/^X//" >'f2p.c.diff' <<'END_OF_FILE' X*** f2p.c.old Tue Apr 24 11:48:14 1990 X--- f2p.c Tue Apr 3 11:32:55 1990 X*************** X*** 547,553 **** X s->back_arrow->ht/ppi, s->back_arrow->wid/ppi); X X for (p2 = p1->next, cp2 = cp1->next; p2 != NULL; X! p1 = p2, cp1 = cp2, p2 = p2->next, cp2 = cp2->next) X { X fprintf(tfp, "line from %.3f,%.3f ", x2, y2); X x1 = x2; X--- 547,553 ---- X s->back_arrow->ht/ppi, s->back_arrow->wid/ppi); X X for (p2 = p1->next, cp2 = cp1->next; p2 != NULL; X! cp1 = cp2, p2 = p2->next, cp2 = cp2->next) X { X fprintf(tfp, "line from %.3f,%.3f ", x2, y2); X x1 = x2; END_OF_FILE if test 589 -ne `wc -c <'f2p.c.diff'`; then echo shar: \"'f2p.c.diff'\" unpacked with wrong size! fi # end of 'f2p.c.diff' fi if test -f 'fig.h.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'fig.h.diff'\" else echo shar: Extracting \"'fig.h.diff'\" $636 characters$ sed "s/^X//" >'fig.h.diff' <<'END_OF_FILE' X*** fig.h.old Tue Apr 24 11:48:16 1990 X--- fig.h Tue Apr 10 11:53:31 1990 X*************** X*** 41,46 **** X--- 41,54 ---- X #include <X11/Xaw/Dialog.h> X #include <X11/Xaw/Box.h> X #include <X11/Xaw/Form.h> X+ #include <X11/Xaw/Cardinals.h> X+ #include <X11/Xaw/Text.h> X+ #include <X11/Xaw/AsciiText.h> X+ #include <X11/Xaw/MenuButton.h> X+ #include <X11/Xaw/SimpleMenu.h> X+ #include <X11/Xaw/Sme.h> X+ #include <X11/Xaw/SmeBSB.h> X+ #include <X11/Xaw/Toggle.h> X /* R3 */ X #else X #include <X11/Command.h> X*************** X*** 50,52 **** X--- 58,61 ---- X #include <X11/Form.h> X #include <X11/Scroll.h> /* XtRFloat lives here! */ X #endif X+ END_OF_FILE if test 636 -ne `wc -c <'fig.h.diff'`; then echo shar: \"'fig.h.diff'\" unpacked with wrong size! fi # end of 'fig.h.diff' fi if test -f 'file.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'file.c.diff'\" else echo shar: Extracting \"'file.c.diff'\" $462 characters$ sed "s/^X//" >'file.c.diff' <<'END_OF_FILE' X*** file.c.old Tue Apr 24 11:48:16 1990 X--- file.c Fri Apr 13 09:16:29 1990 X*************** X*** 119,128 **** X--- 119,135 ---- X X status() X { X+ #ifdef SYSV X+ extern char *getcwd(); X+ X+ if (*directory == NULL) { X+ if (!getcwd(directory,1024)) { X+ #else X extern char *getwd(); X X if (*directory == NULL) { X if (NULL == getwd(directory)) { X+ #endif X put_msg("%s", directory); /* err msg is in directory */ X *directory = '\0'; X return; END_OF_FILE if test 462 -ne `wc -c <'file.c.diff'`; then echo shar: \"'file.c.diff'\" unpacked with wrong size! fi # end of 'file.c.diff' fi if test -f 'flip.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'flip.c.diff'\" else echo shar: Extracting \"'flip.c.diff'\" $2015 characters$ sed "s/^X//" >'flip.c.diff' <<'END_OF_FILE' X*** flip.c.old Tue Apr 24 11:48:16 1990 X--- flip.c Mon Apr 16 11:20:10 1990 X*************** X*** 109,115 **** X { X F_arc *arc; X X! win_setmouseposition(canvas_swfd, px, py); X if (pointmarker_shown) toggle_arcpointmarker(a); X if (copy) { X arc = copy_arc(a); X--- 109,115 ---- X { X F_arc *arc; X X! win_setmouseposition(canvas_win, px, py); X if (pointmarker_shown) toggle_arcpointmarker(a); X if (copy) { X arc = copy_arc(a); X*************** X*** 141,147 **** X { X F_compound *compound; X X! win_setmouseposition(canvas_swfd, px, py); X set_temp_cursor(&wait_cursor); X if (copy) { X compound = copy_compound(c); X--- 141,147 ---- X { X F_compound *compound; X X! win_setmouseposition(canvas_win, px, py); X set_temp_cursor(&wait_cursor); X if (copy) { X compound = copy_compound(c); X*************** X*** 171,177 **** X { X F_ellipse *ellipse; X X! win_setmouseposition(canvas_swfd, px, py); X if (pointmarker_shown) toggle_ellipsepointmarker(e); X if (copy) { X ellipse = copy_ellipse(e); X--- 171,177 ---- X { X F_ellipse *ellipse; X X! win_setmouseposition(canvas_win, px, py); X if (pointmarker_shown) toggle_ellipsepointmarker(e); X if (copy) { X ellipse = copy_ellipse(e); X*************** X*** 203,209 **** X { X F_line *line; X X! win_setmouseposition(canvas_swfd, px, py); X if (pointmarker_shown) toggle_linepointmarker(l); X if (copy) { X line = copy_line(l); X--- 203,209 ---- X { X F_line *line; X X! win_setmouseposition(canvas_win, px, py); X if (pointmarker_shown) toggle_linepointmarker(l); X if (copy) { X line = copy_line(l); X*************** X*** 235,241 **** X { X F_spline *spline; X X! win_setmouseposition(canvas_swfd, px, py); X if (pointmarker_shown) toggle_splinepointmarker(s); X if (copy) { X spline = copy_spline(s); X--- 235,241 ---- X { X F_spline *spline; X X! win_setmouseposition(canvas_win, px, py); X if (pointmarker_shown) toggle_splinepointmarker(s); X if (copy) { X spline = copy_spline(s); END_OF_FILE if test 2015 -ne `wc -c <'flip.c.diff'`; then echo shar: \"'flip.c.diff'\" unpacked with wrong size! fi # end of 'flip.c.diff' fi if test -f 'font.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'font.c.diff'\" else echo shar: Extracting \"'font.c.diff'\" $1669 characters$ sed "s/^X//" >'font.c.diff' <<'END_OF_FILE' X*** font.c.old Tue Apr 24 11:48:17 1990 X--- font.c Thu Apr 5 12:01:48 1990 X*************** X*** 31,37 **** X { X struct xfont *newfont, *nf; X int f,count,i,p,ss; X! char **fontlist,**fname,*np; X X if( appres.boldFont == NULL || *appres.boldFont == NULL) X appres.boldFont = BOLD_FONT; X--- 31,37 ---- X { X struct xfont *newfont, *nf; X int f,count,i,p,ss; X! char **fontlist,**fname; X X if( appres.boldFont == NULL || *appres.boldFont == NULL) X appres.boldFont = BOLD_FONT; X*************** X*** 87,93 **** X nf->fstruct = NULL; /* ditto */ X nf->fname = flist[i].fn; /* keep actual name */ X nf->next = NULL; X- fname++; /* point to next name (if any) */ X } X } X } X--- 87,92 ---- X*************** X*** 120,140 **** X lookfont(f,s) X int f,s; X { X- int found = FALSE; X struct xfont *xf; X- Font font; X XFontStruct *fontst; X X xf = fontnames[f].xfontlist; /* go through the linked list looking for match */ X if (xf == NULL) X return roman_font; /* use a default font */ X! while (!found) X { X if (s <= xf->size) /* exact or larger point size */ X- { X- found = TRUE; X break; X- } X if (xf->next != NULL) /* keep ptr to last if not found */ X xf = xf->next; X else X--- 119,134 ---- X lookfont(f,s) X int f,s; X { X struct xfont *xf; X XFontStruct *fontst; X X xf = fontnames[f].xfontlist; /* go through the linked list looking for match */ X if (xf == NULL) X return roman_font; /* use a default font */ X! while (1) X { X if (s <= xf->size) /* exact or larger point size */ X break; X if (xf->next != NULL) /* keep ptr to last if not found */ X xf = xf->next; X else END_OF_FILE if test 1669 -ne `wc -c <'font.c.diff'`; then echo shar: \"'font.c.diff'\" unpacked with wrong size! fi # end of 'font.c.diff' fi if test -f 'func.h.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'func.h.diff'\" else echo shar: Extracting \"'func.h.diff'\" $384 characters$ sed "s/^X//" >'func.h.diff' <<'END_OF_FILE' X*** func.h.old Tue Apr 24 11:48:17 1990 X--- func.h Fri Apr 6 17:04:30 1990 X*************** X*** 49,54 **** X--- 49,55 ---- X #define F_CHANGE_THICK 54 X #define F_CHANGE_STYLE 55 X #define F_CHANGE_TEXT 56 X+ #define F_CHANGE 57 X X #define F_SET_PEN_SIZE 70 /* set pen size */ X #define F_SET_LINE_STYLE 71 /* set line style */ END_OF_FILE if test 384 -ne `wc -c <'func.h.diff'`; then echo shar: \"'func.h.diff'\" unpacked with wrong size! fi # end of 'func.h.diff' fi if test -f 'graphics.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'graphics.c.diff'\" else echo shar: Extracting \"'graphics.c.diff'\" $1681 characters$ sed "s/^X//" >'graphics.c.diff' <<'END_OF_FILE' X*** graphics.c.old Tue Apr 24 11:48:18 1990 X--- graphics.c Mon Apr 16 11:25:46 1990 X*************** X*** 51,57 **** X xmid = half(x2, x3); X ymid = half(y2, y3); X if (fabs(x1 - xmid) < THRESHOLD && fabs(y1 - ymid) < THRESHOLD) { X! pw_vector(canvas_pixwin, round(x1), round(y1), X round(xmid), round(ymid), op, thick, style, style_val); X } X else { X--- 51,57 ---- X xmid = half(x2, x3); X ymid = half(y2, y3); X if (fabs(x1 - xmid) < THRESHOLD && fabs(y1 - ymid) < THRESHOLD) { X! pw_vector(canvas_win, round(x1), round(y1), X round(xmid), round(ymid), op, thick, style, style_val); X } X else { X*************** X*** 60,66 **** X } X X if (fabs(xmid - x4) < THRESHOLD && fabs(ymid - y4) < THRESHOLD) { X! pw_vector(canvas_pixwin, round(xmid), round(ymid), X round(x4), round(y4), op, thick, style, style_val); X } X else { X--- 60,66 ---- X } X X if (fabs(xmid - x4) < THRESHOLD && fabs(ymid - y4) < THRESHOLD) { X! pw_vector(canvas_win, round(xmid), round(ymid), X round(x4), round(y4), op, thick, style, style_val); X } X else { X*************** X*** 86,92 **** X X while(pop(&x0, &y0, &x1, &y1, &x2, &y2, &x3, &y3)) { X if (fabs(x0 - x3) < THRESHOLD && fabs(y0 - y3) < THRESHOLD) { X! pw_vector(canvas_pixwin, round(x0), round(y0), X round(x3), round(y3), op, thick, style, style_val); X } X else { X--- 86,92 ---- X X while(pop(&x0, &y0, &x1, &y1, &x2, &y2, &x3, &y3)) { X if (fabs(x0 - x3) < THRESHOLD && fabs(y0 - y3) < THRESHOLD) { X! pw_vector(canvas_win, round(x0), round(y0), X round(x3), round(y3), op, thick, style, style_val); X } X else { END_OF_FILE if test 1681 -ne `wc -c <'graphics.c.diff'`; then echo shar: \"'graphics.c.diff'\" unpacked with wrong size! fi # end of 'graphics.c.diff' fi if test -f 'grid.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'grid.c.diff'\" else echo shar: Extracting \"'grid.c.diff'\" $1781 characters$ sed "s/^X//" >'grid.c.diff' <<'END_OF_FILE' X*** grid.c.old Tue Apr 24 11:48:19 1990 X--- grid.c Mon Apr 16 11:25:54 1990 X*************** X*** 62,68 **** X X init_grid() X { X! long bg, fg; X Arg tmp_arg[3]; X X XtSetArg(tmp_arg[0], XtNbackground, &bg); X--- 62,68 ---- X X init_grid() X { X! unsigned long bg, fg; X Arg tmp_arg[3]; X X XtSetArg(tmp_arg[0], XtNbackground, &bg); X*************** X*** 69,84 **** X XtSetArg(tmp_arg[1], XtNforeground, &fg); X XtGetValues(canvas_sw, tmp_arg, 2); X X! null_pm = XCreatePixmapFromBitmapData(tool_d, canvas_pixwin, X null_bits, null_width, null_height, X fg, bg, DefaultDepthOfScreen(tool_s)); X! quarter_pm = XCreatePixmapFromBitmapData(tool_d, canvas_pixwin, X quarter_bits, quarter_width, quarter_height, X fg, bg, DefaultDepthOfScreen(tool_s)); X! half_pm = XCreatePixmapFromBitmapData(tool_d, canvas_pixwin, X half_bits, half_width, half_height, X fg, bg, DefaultDepthOfScreen(tool_s)); X! half_cm_pm = XCreatePixmapFromBitmapData(tool_d, canvas_pixwin, X half_cm_bits, half_cm_width, half_cm_height, X fg, bg, DefaultDepthOfScreen(tool_s)); X } X--- 69,84 ---- X XtSetArg(tmp_arg[1], XtNforeground, &fg); X XtGetValues(canvas_sw, tmp_arg, 2); X X! null_pm = XCreatePixmapFromBitmapData(tool_d, canvas_win, X null_bits, null_width, null_height, X fg, bg, DefaultDepthOfScreen(tool_s)); X! quarter_pm = XCreatePixmapFromBitmapData(tool_d, canvas_win, X quarter_bits, quarter_width, quarter_height, X fg, bg, DefaultDepthOfScreen(tool_s)); X! half_pm = XCreatePixmapFromBitmapData(tool_d, canvas_win, X half_bits, half_width, half_height, X fg, bg, DefaultDepthOfScreen(tool_s)); X! half_cm_pm = XCreatePixmapFromBitmapData(tool_d, canvas_win, X half_cm_bits, half_cm_width, half_cm_height, X fg, bg, DefaultDepthOfScreen(tool_s)); X } END_OF_FILE if test 1781 -ne `wc -c <'grid.c.diff'`; then echo shar: \"'grid.c.diff'\" unpacked with wrong size! fi # end of 'grid.c.diff' fi if test -f 'intspline.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'intspline.c.diff'\" else echo shar: Extracting \"'intspline.c.diff'\" $1186 characters$ sed "s/^X//" >'intspline.c.diff' <<'END_OF_FILE' X*** intspline.c.old Tue Apr 24 11:48:19 1990 X--- intspline.c Mon Apr 16 11:26:01 1990 X*************** X*** 68,74 **** X if (x != fix_x || y != fix_y) get_intermediatepoint(x, y); X draw_elasticline(); X if (num_point <= 2) { X! pw_vector(canvas_pixwin, first_point->x, first_point->y, X cur_point->x, cur_point->y, PAINT, 1, SOLID_LINE, 0.0); X if (num_point == 1) free((char*)cur_point); X free((char*)first_point); X--- 68,74 ---- X if (x != fix_x || y != fix_y) get_intermediatepoint(x, y); X draw_elasticline(); X if (num_point <= 2) { X! pw_vector(canvas_win, first_point->x, first_point->y, X cur_point->x, cur_point->y, PAINT, 1, SOLID_LINE, 0.0); X if (num_point == 1) free((char*)cur_point); X free((char*)first_point); X*************** X*** 87,93 **** X spline->color = cur_color; X spline->depth = 0; X spline->area_fill = 0; X! spline->pen = NULL; X spline->points = first_point; X spline->controls = NULL; X spline->next = NULL; X--- 87,93 ---- X spline->color = cur_color; X spline->depth = 0; X spline->area_fill = 0; X! spline->pen = 0; X spline->points = first_point; X spline->controls = NULL; X spline->next = NULL; END_OF_FILE if test 1186 -ne `wc -c <'intspline.c.diff'`; then echo shar: \"'intspline.c.diff'\" unpacked with wrong size! fi # end of 'intspline.c.diff' fi if test -f 'object.h.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'object.h.diff'\" else echo shar: Extracting \"'object.h.diff'\" $1801 characters$ sed "s/^X//" >'object.h.diff' <<'END_OF_FILE' X*** object.h.old Tue Apr 24 11:48:23 1990 X--- object.h Wed Apr 11 10:56:21 1990 X*************** X*** 14,26 **** X } X F_pattern; X X- /* not used anymore - integer is used instead */ X- typedef struct f_pen { X- int x, y; X- int *p; X- } X- F_pen; X- X typedef struct f_point { X int x, y; X struct f_point *next; X--- 14,19 ---- X*************** X*** 56,64 **** X float style_val; X float angle; X int pen; X- /* X- struct f_pen *pen; X- */ X int area_fill; X struct f_pos center; X struct f_pos radiuses; X--- 49,54 ---- X*************** X*** 76,84 **** X int color; X int depth; X int pen; X- /* X- struct f_pen *pen; X- */ X int area_fill; X float style_val; X int direction; X--- 66,71 ---- X*************** X*** 101,111 **** X int color; X int depth; X float style_val; X! int pen; /* actually corner radius for T_ARC_BOX */ X! /* X! struct f_pen *pen; X! */ X int area_fill; X struct f_arrow *for_arrow; X struct f_arrow *back_arrow; X struct f_point *points; X--- 88,96 ---- X int color; X int depth; X float style_val; X! int pen; X int area_fill; X+ int radius; /* corner radius for T_ARC_BOX */ X struct f_arrow *for_arrow; X struct f_arrow *back_arrow; X struct f_point *points; X*************** X*** 136,144 **** X int base_x; X int base_y; X int pen; X- /* X- struct f_pen *pen; X- */ X char *cstring; X struct f_text *next; X } X--- 121,126 ---- X*************** X*** 167,175 **** X int depth; X float style_val; X int pen; X- /* X- struct f_pen *pen; X- */ X int area_fill; X struct f_arrow *for_arrow; X struct f_arrow *back_arrow; X--- 149,154 ---- END_OF_FILE if test 1801 -ne `wc -c <'object.h.diff'`; then echo shar: \"'object.h.diff'\" unpacked with wrong size! fi # end of 'object.h.diff' fi if test -f 'paintop.h.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'paintop.h.diff'\" else echo shar: Extracting \"'paintop.h.diff'\" $480 characters$ sed "s/^X//" >'paintop.h.diff' <<'END_OF_FILE' X*** paintop.h.old Tue Apr 24 11:48:23 1990 X--- paintop.h Tue Apr 17 14:36:54 1990 X*************** X*** 7,16 **** X * %W% %G% X */ X X! #define INV_PAINT GXxor X! #define MERGE GXor X! #define PAINT GXcopy X! #define ERASE GXcopyInverted X X! #define DRAW 1 X! #define UNDRAW 0 X--- 7,18 ---- X * %W% %G% X */ X X! #define INV_PAINT 0 X! #define MERGE 1 X! #define PAINT 2 X! #define ERASE 3 X X! #define NUMOPS 4 X! X! #define DRAW 1 X! #define UNDRAW 0 END_OF_FILE if test 480 -ne `wc -c <'paintop.h.diff'`; then echo shar: \"'paintop.h.diff'\" unpacked with wrong size! fi # end of 'paintop.h.diff' fi if test -f 'panel.h.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'panel.h.diff'\" else echo shar: Extracting \"'panel.h.diff'\" $2038 characters$ sed "s/^X//" >'panel.h.diff' <<'END_OF_FILE' X*** panel.h.old Tue Apr 24 11:48:25 1990 X--- panel.h Mon Apr 9 09:39:13 1990 X*************** X*** 486,519 **** X 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, }; X mpr_static(text_ic, 32, 32, 1, text_image); X X- static char change_style_image[128]={ X- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, X- 0x00,0x02,0x00,0x10,0x00,0x02,0x00,0x10,0x00,0x02,0x00,0x00, X- 0x00,0x01,0x00,0x08,0x00,0x01,0x00,0x08,0x00,0x01,0x00,0x00, X- 0x80,0x00,0x00,0x04,0x80,0x20,0x04,0x04,0x80,0x30,0x0c,0x00, X- 0x40,0x18,0x18,0x02,0x40,0xfc,0x3f,0x02,0x40,0xfc,0x3f,0x00, X- 0x20,0x18,0x18,0x01,0x20,0x30,0x0c,0x01,0x20,0x20,0x04,0x00, X- 0x10,0x00,0x80,0x00,0x10,0x00,0x80,0x00,0x10,0x00,0x00,0x00, X- 0x08,0x00,0x40,0x00,0x08,0x00,0x40,0x00,0x08,0x00,0x00,0x00, X- 0x04,0x00,0x20,0x00,0x04,0x00,0x20,0x00,0x04,0x00,0x00,0x00, X- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, X- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; X- mpr_static(change_style_ic, 32, 32, 1, change_style_image); X- X- static char change_thick_image[128]={ X- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, X- 0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x0f,0x00,0x04,0x00,0x0f, X- 0x00,0x02,0x80,0x07,0x00,0x02,0x80,0x07,0x00,0x02,0x80,0x07, X- 0x00,0x01,0xc0,0x03,0x00,0x81,0xc0,0x03,0x00,0x81,0xc1,0x03, X- 0x80,0x00,0xe3,0x01,0x80,0xf8,0xe7,0x01,0x80,0xf8,0xe7,0x01, X- 0x80,0x00,0xe3,0x01,0x40,0x80,0xf1,0x00,0x40,0x80,0xf0,0x00, X- 0x40,0x00,0xf0,0x00,0x20,0x00,0x78,0x00,0x20,0x00,0x78,0x00, X- 0x20,0x00,0x78,0x00,0x10,0x00,0x3c,0x00,0x10,0x00,0x3c,0x00, X- 0x10,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, X- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, X- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; X- mpr_static(change_thick_ic, 32, 32, 1, change_thick_image); X- X static char change_image[128] = { X 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, X 0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0x00, 0x00, 0x08, 0x04, 0x00, 0x00, X--- 486,491 ---- END_OF_FILE if test 2038 -ne `wc -c <'panel.h.diff'`; then echo shar: \"'panel.h.diff'\" unpacked with wrong size! fi # end of 'panel.h.diff' fi if test -f 'panel2.h.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'panel2.h.diff'\" else echo shar: Extracting \"'panel2.h.diff'\" $1511 characters$ sed "s/^X//" >'panel2.h.diff' <<'END_OF_FILE' X*** panel2.h.old Tue Apr 24 11:48:26 1990 X--- panel2.h Mon Apr 9 09:39:37 1990 X*************** X*** 291,314 **** X 0x00, 0x00, 0x00, 0x00 }; X mpr_static(textR_ic,54,28,1,textR_image); X X- static char change_text_image[180] = { X- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, X- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, X- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0x00, 0x00, X- 0xe0, 0x7f, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x60, 0x00, 0xc0, 0x7f, 0x00, X- 0xc0, 0x40, 0x00, 0xc0, 0x7f, 0x00, 0xc0, 0x00, 0x00, 0xc0, 0x7f, 0x00, X- 0xc0, 0x08, 0x08, 0xc1, 0x01, 0x00, 0xc0, 0x0f, 0x0c, 0xc3, 0x01, 0x00, X- 0xc0, 0x0f, 0xfe, 0xc7, 0x3f, 0x00, 0xc0, 0x08, 0xfe, 0xc7, 0x3f, 0x00, X- 0xc0, 0x00, 0x0c, 0xc3, 0x3f, 0x00, 0xc0, 0x00, 0x08, 0xc1, 0x01, 0x00, X- 0xc0, 0x00, 0x00, 0xc0, 0x01, 0x00, 0xc0, 0x40, 0x00, 0xc0, 0x7f, 0x00, X- 0xc0, 0x60, 0x00, 0xc0, 0x7f, 0x00, 0xe0, 0x7f, 0x00, 0xc0, 0x7f, 0x00, X- 0xf0, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, X- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, X- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, X- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 X- }; X- mpr_static(change_text_ic,46,28,1,change_text_image); X- X /* image with L dominant, P light */ X static char land_image[120] = { X 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x03, 0x54, 0x05, X--- 291,296 ---- END_OF_FILE if test 1511 -ne `wc -c <'panel2.h.diff'`; then echo shar: \"'panel2.h.diff'\" unpacked with wrong size! fi # end of 'panel2.h.diff' fi if test -f 'patchlevel.h.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'patchlevel.h.diff'\" else echo shar: Extracting \"'patchlevel.h.diff'\" $172 characters$ sed "s/^X//" >'patchlevel.h.diff' <<'END_OF_FILE' X*** patchlevel.h.old Tue Apr 24 11:48:27 1990 X--- patchlevel.h Thu Apr 5 17:42:55 1990 X*************** X*** 1 **** X! #define PATCHLEVEL 5 X--- 1 ---- X! #define PATCHLEVEL 6 END_OF_FILE if test 172 -ne `wc -c <'patchlevel.h.diff'`; then echo shar: \"'patchlevel.h.diff'\" unpacked with wrong size! fi # end of 'patchlevel.h.diff' fi if test -f 'print.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'print.c.diff'\" else echo shar: Extracting \"'print.c.diff'\" $545 characters$ sed "s/^X//" >'print.c.diff' <<'END_OF_FILE' X*** print.c.old Tue Apr 24 11:48:30 1990 X--- print.c Mon Apr 16 11:22:34 1990 X*************** X*** 36,42 **** X } X else { X if (figure_modified) /* modified without saving, confirm print */ X! if (wmgr_confirm(canvas_swfd, conf_prnt) != -1) X return; X X if (! strcmp("Default", printer)) { X--- 36,42 ---- X } X else { X if (figure_modified) /* modified without saving, confirm print */ X! if (wmgr_confirm(canvas_win, conf_prnt) != -1) X return; X X if (! strcmp("Default", printer)) { END_OF_FILE if test 545 -ne `wc -c <'print.c.diff'`; then echo shar: \"'print.c.diff'\" unpacked with wrong size! fi # end of 'print.c.diff' fi if test -f 'psbits3.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'psbits3.c.diff'\" else echo shar: Extracting \"'psbits3.c.diff'\" $505 characters$ sed "s/^X//" >'psbits3.c.diff' <<'END_OF_FILE' X*** psbits3.c.old Tue Apr 24 11:48:33 1990 X--- psbits3.c Wed Apr 11 09:52:58 1990 X*************** X*** 717,723 **** X Times_Italic_bits, X Times_Bold_bits, X Times_BoldItalic_bits, X! AvantGarde_bits, X AvantGarde_BookOblique_bits, X AvantGarde_Demi_bits, X AvantGarde_DemiOblique_bits, X--- 717,723 ---- X Times_Italic_bits, X Times_Bold_bits, X Times_BoldItalic_bits, X! AvantGarde_Book_bits, X AvantGarde_BookOblique_bits, X AvantGarde_Demi_bits, X AvantGarde_DemiOblique_bits, END_OF_FILE if test 505 -ne `wc -c <'psbits3.c.diff'`; then echo shar: \"'psbits3.c.diff'\" unpacked with wrong size! fi # end of 'psbits3.c.diff' fi if test -f 'redisplay.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'redisplay.c.diff'\" else echo shar: Extracting \"'redisplay.c.diff'\" $2342 characters$ sed "s/^X//" >'redisplay.c.diff' <<'END_OF_FILE' X*** redisplay.c.old Tue Apr 24 11:48:37 1990 X--- redisplay.c Wed Apr 18 09:28:44 1990 X*************** X*** 24,32 **** X return; X for (fill=1; fill >= 0; fill--) X { X- redisplay_lineobject(objects->lines,fill); X- redisplay_ellipseobject(objects->ellipses,fill); X redisplay_arcobject(objects->arcs,fill); X redisplay_splineobject(objects->splines,fill); X } X if (pointmarker_shown) /* show the point markers if they are on */ X--- 24,33 ---- X return; X for (fill=1; fill >= 0; fill--) X { X redisplay_arcobject(objects->arcs,fill); X+ redisplay_compoundobject(objects->compounds,fill); X+ redisplay_ellipseobject(objects->ellipses,fill); X+ redisplay_lineobject(objects->lines,fill); X redisplay_splineobject(objects->splines,fill); X } X if (pointmarker_shown) /* show the point markers if they are on */ X*************** X*** 36,43 **** X for (c = objects->compounds; c != NULL; c = c->next) X draw_compoundbox(c, INV_PAINT); /* show the compound boxes */ X } X- /* fill compound objects later */ X- redisplay_compoundobject(objects->compounds); X /* text doesn't have fill mode */ X redisplay_textobject(objects->texts); X } X--- 37,42 ---- X*************** X*** 98,106 **** X } X } X X! redisplay_textobject(texts,fill) X F_text *texts; X- int fill; X { X F_text *t; X X--- 97,104 ---- X } X } X X! redisplay_textobject(texts) X F_text *texts; X { X F_text *t; X X*************** X*** 108,120 **** X draw_text(t, PAINT); X } X X! redisplay_compoundobject(compounds) X F_compound *compounds; X { X F_compound *c; X X! for (c = compounds; c != NULL; c = c->next) X! draw_compound(c); X } X X redisplay_canvas() X--- 106,132 ---- X draw_text(t, PAINT); X } X X! redisplay_compoundobject(compounds,fill) X F_compound *compounds; X+ int fill; X { X F_compound *c; X X! if(compounds == NULL) X! return; X! X! for (c = compounds; c != NULL; c = c->next) { X! redisplay_compoundobject(c->compounds,fill); X! redisplay_arcobject(compounds->arcs,fill); X! redisplay_ellipseobject(compounds->ellipses,fill); X! redisplay_lineobject(compounds->lines,fill); X! redisplay_splineobject(compounds->splines,fill); X! X! /* no filled text mode, just do text on non-filled pass */ X! if(fill==0) { X! redisplay_textobject(compounds->texts); X! } X! } X } X X redisplay_canvas() END_OF_FILE if test 2342 -ne `wc -c <'redisplay.c.diff'`; then echo shar: \"'redisplay.c.diff'\" unpacked with wrong size! fi # end of 'redisplay.c.diff' fi if test -f 'resources.h.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'resources.h.diff'\" else echo shar: Extracting \"'resources.h.diff'\" $969 characters$ sed "s/^X//" >'resources.h.diff' <<'END_OF_FILE' X*** resources.h.old Tue Apr 24 11:48:37 1990 X--- resources.h Mon Apr 16 11:36:11 1990 X*************** X*** 114,125 **** X set_line_stuff(1,SOLID_LINE,0.0,(op)); \ X XDrawRectangle(tool_d,(win),gccache[(op)],(x),(y),(w),(h)) X X! EXTERN PIXWIN canvas_pixwin, X! msg_pixwin, X! panel_pixwin, X! panel2_pixwin, X! sideruler_pixwin, X! topruler_pixwin; X X EXTERN CURSOR cur_cursor; X EXTERN CURSORREC arrow_cursor, X--- 114,123 ---- X set_line_stuff(1,SOLID_LINE,0.0,(op)); \ X XDrawRectangle(tool_d,(win),gccache[(op)],(x),(y),(w),(h)) X X! EXTERN PIXWIN canvas_win, X! msg_win, X! sideruler_win, X! topruler_win; X X EXTERN CURSOR cur_cursor; X EXTERN CURSORREC arrow_cursor, X*************** X*** 146,158 **** X radius_panel, X sideruler_sw, X topruler_sw; X- X- EXTERN FDTYPE canvas_swfd, X- panel_swfd, X- panel2_swfd, X- msgswfd, X- trswfd, X- srswfd; X X EXTERN Display *tool_d; X EXTERN Screen *tool_s; X--- 144,149 ---- END_OF_FILE if test 969 -ne `wc -c <'resources.h.diff'`; then echo shar: \"'resources.h.diff'\" unpacked with wrong size! fi # end of 'resources.h.diff' fi if test -f 'rotate.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'rotate.c.diff'\" else echo shar: Extracting \"'rotate.c.diff'\" $2019 characters$ sed "s/^X//" >'rotate.c.diff' <<'END_OF_FILE' X*** rotate.c.old Tue Apr 24 11:48:38 1990 X--- rotate.c Mon Apr 16 11:22:53 1990 X*************** X*** 107,113 **** X { X F_line *line; X X! win_setmouseposition(canvas_swfd, px, py); X if (pointmarker_shown) toggle_linepointmarker(l); X if (copy) { X line = copy_line(l); X--- 107,113 ---- X { X F_line *line; X X! win_setmouseposition(canvas_win, px, py); X if (pointmarker_shown) toggle_linepointmarker(l); X if (copy) { X line = copy_line(l); X*************** X*** 140,146 **** X { X F_ellipse *ellipse; X X! win_setmouseposition(canvas_swfd, px, py); X if (pointmarker_shown) toggle_ellipsepointmarker(e); X if (copy) { X ellipse = copy_ellipse(e); X--- 140,146 ---- X { X F_ellipse *ellipse; X X! win_setmouseposition(canvas_win, px, py); X if (pointmarker_shown) toggle_ellipsepointmarker(e); X if (copy) { X ellipse = copy_ellipse(e); X*************** X*** 173,179 **** X { X F_arc *arc; X X! win_setmouseposition(canvas_swfd, px, py); X if (pointmarker_shown) toggle_arcpointmarker(a); X if (copy) { X arc = copy_arc(a); X--- 173,179 ---- X { X F_arc *arc; X X! win_setmouseposition(canvas_win, px, py); X if (pointmarker_shown) toggle_arcpointmarker(a); X if (copy) { X arc = copy_arc(a); X*************** X*** 206,212 **** X { X F_spline *spline; X X! win_setmouseposition(canvas_swfd, px, py); X if (pointmarker_shown) toggle_splinepointmarker(s); X if (copy) { X spline = copy_spline(s); X--- 206,212 ---- X { X F_spline *spline; X X! win_setmouseposition(canvas_win, px, py); X if (pointmarker_shown) toggle_splinepointmarker(s); X if (copy) { X spline = copy_spline(s); X*************** X*** 239,245 **** X { X F_compound *compound; X X! win_setmouseposition(canvas_swfd, px, py); X set_temp_cursor(&wait_cursor); X if (copy) { X compound = copy_compound(c); X--- 239,245 ---- X { X F_compound *compound; X X! win_setmouseposition(canvas_win, px, py); X set_temp_cursor(&wait_cursor); X if (copy) { X compound = copy_compound(c); END_OF_FILE if test 2019 -ne `wc -c <'rotate.c.diff'`; then echo shar: \"'rotate.c.diff'\" unpacked with wrong size! fi # end of 'rotate.c.diff' fi if test -f 'save.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'save.c.diff'\" else echo shar: Extracting \"'save.c.diff'\" $1749 characters$ sed "s/^X//" >'save.c.diff' <<'END_OF_FILE' X*** save.c.old Tue Apr 24 11:48:39 1990 X--- save.c Mon Apr 16 11:22:58 1990 X*************** X*** 49,55 **** X } X else if (prompt) { X sprintf(string, "\"%s\" File exists. Please click the LEFT button to COMFIRM overwrite. To cancel, click the MIDDLE or RIGHT button.", file_name); X! if (wmgr_confirm(canvas_swfd, string) != -1) { X put_msg("Cancel save"); X return(-1); X } X--- 49,55 ---- X } X else if (prompt) { X sprintf(string, "\"%s\" File exists. Please click the LEFT button to COMFIRM overwrite. To cancel, click the MIDDLE or RIGHT button.", file_name); X! if (wmgr_confirm(canvas_win, string) != -1) { X put_msg("Cancel save"); X return(-1); X } X*************** X*** 192,200 **** X X if( l->points == NULL ) X return; X! fprintf(fp, "%d %d %d %d %d %d %d %d %.3f %d %d\n", X O_POLYLINE, l->type, l->style, l->thickness, X! l->color, l->depth, l->pen, l->area_fill, l->style_val, X ((f = l->for_arrow) ? 1 : 0), ((b = l->back_arrow) ? 1 : 0)); X if (f) X fprintf(fp, "\t%d %d %.3f %.3f %.3f\n", f->type, f->style, X--- 192,206 ---- X X if( l->points == NULL ) X return; X! if (l->type == T_ARC_BOX) X! fprintf(fp, "%d %d %d %d %d %d %d %d %.3f %d %d %d\n", X O_POLYLINE, l->type, l->style, l->thickness, X! l->color, l->depth, l->pen, l->area_fill, l->style_val, l->radius, X! ((f = l->for_arrow) ? 1 : 0), ((b = l->back_arrow) ? 1 : 0)); X! else X! fprintf(fp, "%d %d %d %d %d %d %d %d %.3f %d %d\n", X! O_POLYLINE, l->type, l->style, l->thickness, X! l->color, l->depth, l->pen, l->area_fill, l->style_val, X ((f = l->for_arrow) ? 1 : 0), ((b = l->back_arrow) ? 1 : 0)); X if (f) X fprintf(fp, "\t%d %d %.3f %.3f %.3f\n", f->type, f->style, END_OF_FILE if test 1749 -ne `wc -c <'save.c.diff'`; then echo shar: \"'save.c.diff'\" unpacked with wrong size! fi # end of 'save.c.diff' fi if test -f 'search.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'search.c.diff'\" else echo shar: Extracting \"'search.c.diff'\" $786 characters$ sed "s/^X//" >'search.c.diff' <<'END_OF_FILE' X*** search.c.old Tue Apr 24 11:48:40 1990 X--- search.c Tue Mar 6 09:09:23 1990 X*************** X*** 62,68 **** X *py = e->center.y; X return(e); X } X! r = a * b * dis / sqrt((double) (1.0*b*b*dx*dx + 1.0*a*a*dy*dy)); X if (fabs(dis - r) <= tol) { X *px = (int)(r*dx/dis + ((dx < 0) ? -.5 : .5)) + e->center.x; X *py = (int)(r*dy/dis + ((dy < 0) ? -.5 : .5)) + e->center.y; X--- 62,71 ---- X *py = e->center.y; X return(e); X } X! if(a * dy == 0 && b * dx == 0) X! r = 0; /* prevent core dumps */ X! else X! r = a * b * dis / sqrt((double) (1.0*b*b*dx*dx + 1.0*a*a*dy*dy)); X if (fabs(dis - r) <= tol) { X *px = (int)(r*dx/dis + ((dx < 0) ? -.5 : .5)) + e->center.x; X *py = (int)(r*dy/dis + ((dy < 0) ? -.5 : .5)) + e->center.y; END_OF_FILE if test 786 -ne `wc -c <'search.c.diff'`; then echo shar: \"'search.c.diff'\" unpacked with wrong size! fi # end of 'search.c.diff' fi if test -f 'spline.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'spline.c.diff'\" else echo shar: Extracting \"'spline.c.diff'\" $2402 characters$ sed "s/^X//" >'spline.c.diff' <<'END_OF_FILE' X*** spline.c.old Tue Apr 24 11:48:40 1990 X--- spline.c Mon Apr 16 11:26:05 1990 X*************** X*** 69,75 **** X if (x != fix_x || y != fix_y) get_intermediatepoint(x, y); X draw_elasticline(); X if (num_point <= 2) { X! pw_vector(canvas_pixwin, first_point->x, first_point->y, X cur_point->x, cur_point->y, PAINT, 1, SOLID_LINE, 0.0); X if (num_point == 1) free((char*)cur_point); X free((char*)first_point); X--- 69,75 ---- X if (x != fix_x || y != fix_y) get_intermediatepoint(x, y); X draw_elasticline(); X if (num_point <= 2) { X! pw_vector(canvas_win, first_point->x, first_point->y, X cur_point->x, cur_point->y, PAINT, 1, SOLID_LINE, 0.0); X if (num_point == 1) free((char*)cur_point); X free((char*)first_point); X*************** X*** 82,88 **** X spline->style_val = cur_styleval; X spline->color = cur_color; X spline->depth = 0; X! spline->pen = NULL; X spline->area_fill = 0; X spline->points = first_point; X spline->controls = NULL; X--- 82,88 ---- X spline->style_val = cur_styleval; X spline->color = cur_color; X spline->depth = 0; X! spline->pen = 0; X spline->area_fill = 0; X spline->points = first_point; X spline->controls = NULL; X*************** X*** 149,155 **** X if (spline->back_arrow) /* backward arrow */ X draw_arrow((int)x2, (int)y2, (int)x1, (int)y1, X spline->back_arrow, op); X! pw_vector(canvas_pixwin, (int)x1, (int)y1, round(cx1), X round(cy1), op, spline->thickness, X spline->style, spline->style_val); X X--- 149,155 ---- X if (spline->back_arrow) /* backward arrow */ X draw_arrow((int)x2, (int)y2, (int)x1, (int)y1, X spline->back_arrow, op); X! pw_vector(canvas_win, (int)x1, (int)y1, round(cx1), X round(cy1), op, spline->thickness, X spline->style, spline->style_val); X X*************** X*** 163,169 **** X cx1 = cx4; cy1 = cy4; X cx2 = (cx1 + x2) / 2; cy2 = (cy1 + y2) / 2; X } X! pw_vector(canvas_pixwin, round(cx1), round(cy1), X (int)x2, (int)y2, op, spline->thickness, X spline->style, spline->style_val); X if (spline->for_arrow) /* forward arrow */ X--- 163,169 ---- X cx1 = cx4; cy1 = cy4; X cx2 = (cx1 + x2) / 2; cy2 = (cy1 + y2) / 2; X } X! pw_vector(canvas_win, round(cx1), round(cy1), X (int)x2, (int)y2, op, spline->thickness, X spline->style, spline->style_val); X if (spline->for_arrow) /* forward arrow */ END_OF_FILE if test 2402 -ne `wc -c <'spline.c.diff'`; then echo shar: \"'spline.c.diff'\" unpacked with wrong size! fi # end of 'spline.c.diff' fi if test -f 'troff_ft_codes.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'troff_ft_codes.diff'\" else echo shar: Extracting \"'troff_ft_codes.diff'\" $435 characters$ sed "s/^X//" >'troff_ft_codes.diff' <<'END_OF_FILE' X*** troff_ft_codes.old Tue Apr 24 11:48:41 1990 X--- troff_ft_codes Wed Apr 11 10:09:01 1990 X*************** X*** 6,12 **** X I Times-Italic X B Times-Bold X BI Times-BoldItalic X! AR AvantGarde X AO AvantGarde-BookOblique X AB AvantGarde-Demi X AX AvantGarde-DemiOblique X--- 6,12 ---- X I Times-Italic X B Times-Bold X BI Times-BoldItalic X! AR AvantGarde-Book X AO AvantGarde-BookOblique X AB AvantGarde-Demi X AX AvantGarde-DemiOblique END_OF_FILE if test 435 -ne `wc -c <'troff_ft_codes.diff'`; then echo shar: \"'troff_ft_codes.diff'\" unpacked with wrong size! fi # end of 'troff_ft_codes.diff' fi if test -f 'turn.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'turn.c.diff'\" else echo shar: Extracting \"'turn.c.diff'\" $983 characters$ sed "s/^X//" >'turn.c.diff' <<'END_OF_FILE' X*** turn.c.old Tue Apr 24 11:48:43 1990 X--- turn.c Wed Apr 11 11:11:18 1990 X*************** X*** 96,103 **** X s->next = NULL; X X l->for_arrow = l->back_arrow = NULL; X! /* l->area_fill = 0; */ X! l->pen = NULL; X l->points = NULL; X X if (-1 == create_control_list(s)) { X--- 96,102 ---- X s->next = NULL; X X l->for_arrow = l->back_arrow = NULL; X! l->pen = 0; X l->points = NULL; X X if (-1 == create_control_list(s)) { X*************** X*** 141,146 **** X--- 140,146 ---- X l->depth = s->depth; X l->style_val = s->style_val; X l->pen = s->pen; X+ l->radius = 0; X l->area_fill = s->area_fill; X l->for_arrow = s->for_arrow; X l->back_arrow = s->back_arrow; X*************** X*** 149,155 **** X X s->for_arrow = s->back_arrow = NULL; X s->area_fill = 0; X! s->pen = NULL; X s->points = NULL; X X draw_line(l, PAINT); X--- 149,155 ---- X X s->for_arrow = s->back_arrow = NULL; X s->area_fill = 0; X! s->pen = 0; X s->points = NULL; X X draw_line(l, PAINT); END_OF_FILE if test 983 -ne `wc -c <'turn.c.diff'`; then echo shar: \"'turn.c.diff'\" unpacked with wrong size! fi # end of 'turn.c.diff' fi if test -f 'undo.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'undo.c.diff'\" else echo shar: Extracting \"'undo.c.diff'\" $1361 characters$ sed "s/^X//" >'undo.c.diff' <<'END_OF_FILE' X*** undo.c.old Tue Apr 24 11:48:43 1990 X--- undo.c Tue Apr 17 16:35:19 1990 X*************** X*** 68,73 **** X--- 68,75 ---- X case F_DELETE_POINT : X undo_deletepoint(); X break; X+ case F_CHANGE : X+ undo_change(); X default : X return; X } X*************** X*** 104,109 **** X--- 106,114 ---- X X undo_glue() X { X+ put_msg("UNDO for GLUE not working"); X+ return; X+ X if (compoundbox_shown) X draw_compoundbox(saved_objects.compounds, INV_PAINT); X delete_compound(&objects.compounds, saved_objects.compounds); X*************** X*** 110,115 **** X--- 115,142 ---- X append_objects(&objects, saved_objects.compounds, &object_tails); X last_action = F_BREAK; X } X+ X+ undo_change() X+ { X+ switch (last_object) { X+ case O_POLYLINE : X+ change_line(saved_objects.lines->next,saved_objects.lines); X+ break; X+ case O_ELLIPSE: X+ change_ellipse(saved_objects.ellipses->next,saved_objects.ellipses); X+ break; X+ case O_TEXT : X+ change_text(saved_objects.texts->next,saved_objects.texts); X+ break; X+ case O_SPLINE : X+ change_spline(saved_objects.splines->next,saved_objects.splines); X+ break; X+ case O_ARC : X+ change_arc(saved_objects.arcs->next,saved_objects.arcs); X+ break; X+ } X+ last_action = F_CHANGE; X+ } X X /* X When a single object is created, it is inserted as the first object in END_OF_FILE if test 1361 -ne `wc -c <'undo.c.diff'`; then echo shar: \"'undo.c.diff'\" unpacked with wrong size! fi # end of 'undo.c.diff' fi if test -f 'version.h.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'version.h.diff'\" else echo shar: Extracting \"'version.h.diff'\" $477 characters$ sed "s/^X//" >'version.h.diff' <<'END_OF_FILE' X*** version.h.old Tue Apr 24 11:48:44 1990 X--- version.h Wed Apr 11 11:19:09 1990 X*************** X*** 9,15 **** X X #define FIG_VERSION "2.0" X #ifndef TFX X! #define PROTOCOL_VERSION "1.4X" /* file format */ X #else X! #define PROTOCOL_VERSION "1.4-TFX" /* file format */ X #endif X--- 9,15 ---- X X #define FIG_VERSION "2.0" X #ifndef TFX X! #define PROTOCOL_VERSION "2.0" /* file format */ X #else X! #define PROTOCOL_VERSION "2.0-TFX" /* file format */ X #endif END_OF_FILE if test 477 -ne `wc -c <'version.h.diff'`; then echo shar: \"'version.h.diff'\" unpacked with wrong size! fi # end of 'version.h.diff' fi if test -f 'xtra.h.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'xtra.h.diff'\" else echo shar: Extracting \"'xtra.h.diff'\" $334 characters$ sed "s/^X//" >'xtra.h.diff' <<'END_OF_FILE' X*** xtra.h.old Tue Apr 24 11:48:48 1990 X--- xtra.h Tue Apr 10 16:32:56 1990 X*************** X*** 16,25 **** X XDrawString(tool_d, (w), (font==bold_font)?bold_gc: gc, (x), (y), \ X (string), strlen(string)) X X- #define pw_batch_on(w) X- X- #define pw_batch_off(w) X- X #define CTRL_H 8 X #define NL 10 X #define CR 13 X--- 16,21 ---- END_OF_FILE if test 334 -ne `wc -c <'xtra.h.diff'`; then echo shar: \"'xtra.h.diff'\" unpacked with wrong size! fi # end of 'xtra.h.diff' fi echo shar: End of archive 1 $of 6$. cp /dev/null ark1isdone MISSING="" for I in 1 2 3 4 5 6 ; do if test ! -f ark${I}isdone ; then MISSING="${MISSING} ${I}" fi done if test "${MISSING}" = "" ; then echo You have unpacked all 6 archives. rm -f ark[1-9]isdone else echo You still need to unpack the following archives: echo " " ${MISSING} fi ## End of shell archive. exit 0 dan ----------------------------------------------------------- O'Reilly && Associates argv@sun.com / argv@ora.com 632 Petaluma Ave, Sebastopol, CA 95472 800-338-NUTS, in CA: 800-533-NUTS, FAX 707-829-0104 Opinions expressed reflect those of the author only.